improve base page and control naming conventions