Change screen naming to use base 10