Removed hardcoded name