Fixes some naming conventions as well as an action problem that was occuring.