cleanup
namespace alias renaming
working on language-specific lookup (lexical analysis)