Naming fix

Fixed some naming, underped some stuff