catch up with renames
Added security warnings