small updates and bugfix for Data.php

[njparadis]

• found a couple of typos that have been here for a very long time
• fixed namespacing issue I missed during refactoring (unit tests will help prevent that in the future!)