improve code names