more compliance with naming conventions.  most underscores gone now.  not all.