Fix a problem with naming (step1)
Fix a problem with naming (step2)