Fixing consistancy in naming