A few renames and cleanups
Working :)