Services renaming to a more semantic approach.
Lexer and parser basic test.