Removing alias attribute, using name instead. Added unit tests.