Cleaned up naming (removed unnecessarily specified "field" and "message"  references from names)