Better names
Updated error message text