variables, mixin names and filenames corrections