security fix & some variable/class renaming