renaming fixes for EPG as well as contract