Add Namespace Support, Parser Tests

Refactor names