Merged updates from log repo and added minor changes to naming of several macros.