Update to match new gem/class names