Generated signatures/fields names refractored.