Renames and some function additions