Refactored names
Fixes for setting team option