Various name changes

Changed a lot of names to follow the naming I think is easier to
understand