Changed names and logs to be more generic