Renames

make all the names sane

filename == name of function in said file