fixed more renaming issues. Have to step back now and find the perfect naming and seo routing