Fixed incorrect naming of HomeOrganization and HomeOrganizationType

Resolves #128