diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index ca19cb455db2ecf0c02fd3a0c2c720c17f7abd98..eb58d0c6ffe80058b650ff7f6686b9d720f5f5be 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -27,7 +27,7 @@
 #' startDate <- '1985-01-01'
 #' endDate <- ''
 #' pCode <- c("00060","00010")
-#' \dontrun{
+#' \donttest{
 #' # Not running for time considerations
 #' url_daily <- constructNWISURL(siteNumber,pCode,
 #'            startDate,endDate,'dv',statCd=c("00003","00001"))
@@ -48,7 +48,7 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate
 
   service <- match.arg(service, c("dv","uv","iv","qw","gwlevels","rating","peak","meas"))
   
-  parameterCdFile <- parameterCdFile
+  data(parameterCdFile)
   
   if(any(!is.na(parameterCd))){
     pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
diff --git a/R/readNWISpCode.r b/R/readNWISpCode.r
index 24e8fcdfdbb11e34a6a100b99da2f3933eee4ee5..95b9a66ef5052a9220c3ceeb1d069f3c88a4cd20 100644
--- a/R/readNWISpCode.r
+++ b/R/readNWISpCode.r
@@ -35,7 +35,7 @@ readNWISpCode <- function(parameterCd){
     parameterCd <- parameterCd[goodIndex]
   }
   
-  parameterCdFile <- parameterCdFile
+  data(parameterCdFile)
   
   parameterData <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCd,]
 
diff --git a/R/tabbedDataRetrievals.R b/R/tabbedDataRetrievals.R
index 003bfe8acfbe82797635f0b7fa8bb05c6cdf09e9..4d4dacf41c0d095b27559587a70c4d68a1a0ee6d 100644
--- a/R/tabbedDataRetrievals.R
+++ b/R/tabbedDataRetrievals.R
@@ -47,7 +47,7 @@ NULL
 #' @docType data
 #' @keywords USGS parameterCd
 #' @examples
-#' parameterCdFile <- parameterCdFile
+#' data(parameterCdFile)
 #' dischargeInfo <- parameterCdFile[parameterCdFile$parameter_cd=="00060",]
 NULL
 
diff --git a/R/whatNWISData.r b/R/whatNWISData.r
index 7d32e365e3993e9ff290394bc6335df15f62c6eb..1d2ed461b426b8af800ed924da8b0403ad4418bd 100644
--- a/R/whatNWISData.r
+++ b/R/whatNWISData.r
@@ -96,7 +96,7 @@ whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all
   
   parameterCds <- unique(SiteFile$parm_cd)
   
-  parameterCdFile <- parameterCdFile
+  data(parameterCdFile)
   
   parameterCdINFO <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCds,]
   SiteFile <- merge(SiteFile,parameterCdINFO,by.x="parm_cd" ,by.y="parameter_cd",all=TRUE)
diff --git a/man/constructNWISURL.Rd b/man/constructNWISURL.Rd
index 100f4eaaafabd1fde6f67c4c4b1cf511122bd0d9..cbe2bde3f81cb6c161a97250ec2773d22afdee93 100644
--- a/man/constructNWISURL.Rd
+++ b/man/constructNWISURL.Rd
@@ -44,7 +44,7 @@ siteNumber <- '01594440'
 startDate <- '1985-01-01'
 endDate <- ''
 pCode <- c("00060","00010")
-\dontrun{
+\donttest{
 # Not running for time considerations
 url_daily <- constructNWISURL(siteNumber,pCode,
            startDate,endDate,'dv',statCd=c("00003","00001"))
diff --git a/man/parameterCdFile.Rd b/man/parameterCdFile.Rd
index 4052d274888c8c77bd6628e592441bb4127da87d..e52989d47c4a14499c7e787c72ae45aaf0347fac 100644
--- a/man/parameterCdFile.Rd
+++ b/man/parameterCdFile.Rd
@@ -22,7 +22,7 @@ Complete list of USGS parameter codes as of November 7, 2014. The data was pulle
 format=rdb&show=parameter_group_nm&show=parameter_nm&show=casrn&show=srsname&show=parameter_units}
 }
 \examples{
-parameterCdFile <- parameterCdFile
+data(parameterCdFile)
 dischargeInfo <- parameterCdFile[parameterCdFile$parameter_cd=="00060",]
 }
 \keyword{USGS}