Follow through with mission to loiter switch renaming