Make layout & drawable naming more sane