Changed some naming conventions to reduce ambiguity.