changed filename and basename columns check

now it checks against class instance methods instead of model columns