Use consistent naming with checks
Update po files