More component references needed fixing!
Merge pull request #337 from mattdenner/fix_more_component_references

More component references needed fixing!