refine the definition files naming
refine the definition files naming