Update names in POMs to be more consistent with others