Fixed naming and goo for CM10.1