fixing
renaming aliases