BS-2672: the form name need to keep its first upper case. fix issue when
backport of bugfix has been applied