change class names to be more consistent,
default template makeup