Rename back to custom

Change-Id: I8805c83e569f78f506cae35af2e303ef236ee0ea