Fixed bugs from better name convection