Changed alias names for more clarity