Fix fhc credentials command
Move common commands replicated in new style in as fh2 commands