Refine naming conventions.