fixed some naming etc