Fixed: class names more consistant