Cleanup naming and remove previous flags