Homestyx hydra

R1:a4c076ac79db

Fix a minor merge issue with a class rename

Auditors: chad, btrahan
Repository: R1 hydra
Commit Date: Sep 10 2013