Renamed main form files

Signed-off-by: Mike Hodgson <mhodgson@gmail.com>