Follow control naming conventions