Refactored forms to have Forms as a suffix