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

This reverts commit 6a6a88a19be3bfeec9798d64f6070fff10abd7f3.