Corrected document unlocking and renamed conflicting method (closes #3918)(closes #3955)