More class name fixes

I missed a few home__ prefixes :rolleyes: