Lot of updates to process methods and refactoring entity names