Rename troubles fixed.
Rename troubles fixed.

frandallfarmer/neohabitat,ssalevan/neohabitat,ssalevan/neohabitat,frandallfarmer/neohabitat,ssalevan/neohabitat,frandallfarmer/neohabitat,frandallfarmer/neohabitat,frandallfarmer/neohabitat,ssalevan/neohabitat,frandallfarmer/neohabitat,ssalevan/neohabitat,ssalevan/neohabitat