Code analysis on naming fixed