removed obsolete calls
changed source file names in ngis package