Use correct directory + use a better name