Updated error name source
auto-merge staging into master