More appropriate iterface naming convention
Remove deprecated config vars