fix template according to new namingConvention
add naming convention file
add template classes