Naming Issue Correction