Renamed some xml functions and added more functionality to base entity
Reworked the aspect service to use the entity's element name