refactored so that alias names dont get changed (because the dev probably knew what he was doing we setting it)