Change form names to make more sense