Fixed form naming convention

See the issue #371 .

I mark this one as **Important**.