Added type aliases and updated name related classes to use them when applicable