Improvement on forms names