Android - add extraHour in TargetHourGlueSubject
Android - change some names