Base Classes Added
Various Naming Tweaks