refactored dir/var names