Changed class name separator to match that used by updated code generator
Updated class name separator in filenames to match output of code generator