changes to naming conventions, screen State enum