JCLOUDS-458: Resource name changes