added naming consistencies