some naming changes to make it look right on first glimps. shouldnt break anthing yet