Fix name convention issue