Security name refactoring
continue security specs