changed minor naming stuff