semantics

just some naming conventions to make it nicer.