Sight fixes with cookiecutter nameing