updated naming & stuff