Refs #85 - Rename root level components