Small renames

Sorry for commit spams hehe.