- Modified built names based on BytecodeMethods to include the methods name too
- Minor changes to generated names