Fixing name collisions, fixed adding pavlov options, removed creating pavlov_options in compatablity layer.