More Renaming tests

Last commit didnt work at all