Merge "Comply with naming conventions: Apex verify job"