Changed autogenerated names format, fixed missing generated include