Refined naming convention