Fixed minor naming errors