Fixing up to use erlang style record names with underbars