Tweaks to the interface, nothing major

Signed-off-by: xrabohrok <westin007@gmail.com>
renaming and consolidating.  Functionality comes next