refactors y renames