crDroid customs: better naming

Change-Id: Ifcf0e285ff9d33c734e185840622e55b9a442319