Fixed some renaming issues. Should probably be 2 repos..