Modifying error and label messages for consistency. Change to public error messages API.