This is a big change focusing on renaming from phone* to screen* and

update some nits