Bugs and naming changes in security.php