Naming stuff

Just some naming improvements