Fixed up to match XperiaZR specs and fix naming conflicts