Begining of tweaks to renaming methods