Fixed some naming conventions/types