CLean up several message name changes