Modify existing spec and add more to verify entity names inside of modules