Class nameing

Take two