Fixed some name consistency issue