Cleanup name of subforms unit. Will merge.