diff --git a/IPhreeqc.cpp b/IPhreeqc.cpp
index 748c8b58..356c7dca 100644
--- a/IPhreeqc.cpp
+++ b/IPhreeqc.cpp
@@ -282,14 +282,14 @@ const std::string& IPhreeqc::GetAccumulatedLines(void)
 	return this->StringInput;
 }
 
-void IPhreeqc::OutputLastError(void)
+void IPhreeqc::OutputError(void)
 {
-	std::cout << this->GetLastErrorString() << std::endl;
+	std::cout << this->GetErrorString() << std::endl;
 }
 
-void IPhreeqc::OutputLastWarning(void)
+void IPhreeqc::OutputWarning(void)
 {
-	std::cout << this->GetLastWarningString() << std::endl;
+	std::cout << this->GetWarningString() << std::endl;
 }
 
 void IPhreeqc::OutputLines(void)
@@ -392,13 +392,13 @@ void IPhreeqc::UnLoadDatabase(void)
 	//
 	ASSERT(this->ErrorReporter);
 	this->ErrorReporter->Clear();
-	this->LastErrorString.clear();
+	this->ErrorString.clear();
 
 	// clear warning state
 	//
 	ASSERT(this->WarningReporter);
 	this->WarningReporter->Clear();
-	this->LastWarningString.clear();
+	this->WarningString.clear();
 
 	// clear selectedoutput
 	//
@@ -652,16 +652,16 @@ void IPhreeqc::AddSelectedOutput(const char* name, const char* format, va_list a
 	}
 }
 
-const char* IPhreeqc::GetLastErrorString(void)
+const char* IPhreeqc::GetErrorString(void)
 {
-	this->LastErrorString = ((CErrorReporter<std::ostringstream>*)this->ErrorReporter)->GetOS()->str();
-	return this->LastErrorString.c_str();
+	this->ErrorString = ((CErrorReporter<std::ostringstream>*)this->ErrorReporter)->GetOS()->str();
+	return this->ErrorString.c_str();
 }
 
-const char* IPhreeqc::GetLastWarningString(void)
+const char* IPhreeqc::GetWarningString(void)
 {
-	this->LastWarningString = ((CErrorReporter<std::ostringstream>*)this->WarningReporter)->GetOS()->str();
-	return this->LastWarningString.c_str();
+	this->WarningString = ((CErrorReporter<std::ostringstream>*)this->WarningReporter)->GetOS()->str();
+	return this->WarningString.c_str();
 }
 
 const char* IPhreeqc::GetDumpString(void)
@@ -1253,10 +1253,10 @@ const char* IPhreeqc::GetWarningLine(int n)
 void IPhreeqc::update_errors(void)
 {
 	this->ErrorLines.clear();
-	this->LastErrorString = ((CErrorReporter<std::ostringstream>*)this->ErrorReporter)->GetOS()->str();
-	if (this->LastErrorString.size())
+	this->ErrorString = ((CErrorReporter<std::ostringstream>*)this->ErrorReporter)->GetOS()->str();
+	if (this->ErrorString.size())
 	{
-		std::istringstream iss(this->LastErrorString);
+		std::istringstream iss(this->ErrorString);
 		std::string line;
 		while (std::getline(iss, line))
 		{
@@ -1265,10 +1265,10 @@ void IPhreeqc::update_errors(void)
 	}
 
 	this->WarningLines.clear();
-	this->LastWarningString = ((CErrorReporter<std::ostringstream>*)this->WarningReporter)->GetOS()->str();
-	if (this->LastWarningString.size())
+	this->WarningString = ((CErrorReporter<std::ostringstream>*)this->WarningReporter)->GetOS()->str();
+	if (this->WarningString.size())
 	{
-		std::istringstream iss(this->LastWarningString);
+		std::istringstream iss(this->WarningString);
 		std::string line;
 		while (std::getline(iss, line))
 		{
diff --git a/IPhreeqcF.f b/IPhreeqcF.f
index 6a296457..553a512b 100644
--- a/IPhreeqcF.f
+++ b/IPhreeqcF.f
@@ -40,17 +40,17 @@
         UnLoadDatabase = UnLoadDatabaseF(ID)
       END FUNCTION UnLoadDatabase
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-      SUBROUTINE OutputLastError(ID)
+      SUBROUTINE OutputError(ID)
         IMPLICIT NONE
         INTEGER :: ID
-        CALL OutputLastErrorF(ID)
-      END SUBROUTINE OutputLastError
+        CALL OutputErrorF(ID)
+      END SUBROUTINE OutputError
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-      SUBROUTINE OutputLastWarning(ID)
+      SUBROUTINE OutputWarning(ID)
         IMPLICIT NONE
         INTEGER :: ID
-        CALL OutputLastWarningF(ID)
-      END SUBROUTINE OutputLastWarning
+        CALL OutputWarningF(ID)
+      END SUBROUTINE OutputWarning
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       FUNCTION AccumulateLine(ID,LINE)
         IMPLICIT NONE
diff --git a/IPhreeqcLib.cpp b/IPhreeqcLib.cpp
index 8ed5252c..de418d78 100644
--- a/IPhreeqcLib.cpp
+++ b/IPhreeqcLib.cpp
@@ -64,51 +64,51 @@ UnLoadDatabase(int id)
 }
 
 void
-OutputLastError(int id)
+OutputError(int id)
 {
-	static const char err_msg[] = "OutputLastError: Bad instance.\n";
+	static const char err_msg[] = "OutputError: Bad instance.\n";
 	IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
 	if (IPhreeqcPtr)
 	{
-		IPhreeqcPtr->OutputLastError();
+		IPhreeqcPtr->OutputError();
 		return;
 	}
 	std::cout << err_msg << std::endl;
 }
 
 void
-OutputLastWarning(int id)
+OutputWarning(int id)
 {
-	static const char err_msg[] = "OutputLastWarning: Bad instance.\n";
+	static const char err_msg[] = "OutputWarning: Bad instance.\n";
 	IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
 	if (IPhreeqcPtr)
 	{
-		IPhreeqcPtr->OutputLastWarning();
+		IPhreeqcPtr->OutputWarning();
 		return;
 	}
 	std::cout << err_msg << std::endl;
 }
 
 const char*
-GetLastErrorString(int id)
+GetErrorString(int id)
 {
-	static const char err_msg[] = "GetLastErrorString: Bad instance.\n";
+	static const char err_msg[] = "GetErrorString: Bad instance.\n";
 	IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
 	if (IPhreeqcPtr)
 	{
-		return IPhreeqcPtr->GetLastErrorString();
+		return IPhreeqcPtr->GetErrorString();
 	}
 	return err_msg;
 }
 
 const char*
-GetLastWarningString(int id)
+GetWarningString(int id)
 {
-	static const char err_msg[] = "GetLastWarningString: Bad instance.\n";
+	static const char err_msg[] = "GetWarningString: Bad instance.\n";
 	IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
 	if (IPhreeqcPtr)
 	{
-		return IPhreeqcPtr->GetLastWarningString();
+		return IPhreeqcPtr->GetWarningString();
 	}
 	return err_msg;
 }
diff --git a/fwrap.cpp b/fwrap.cpp
index 20025e77..cc248ec4 100644
--- a/fwrap.cpp
+++ b/fwrap.cpp
@@ -290,15 +290,15 @@ GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue,
 }
 
 void
-OutputLastErrorF(int *id)
+OutputErrorF(int *id)
 {
-	::OutputLastError(*id);
+	::OutputError(*id);
 }
 
 void
-OutputLastWarningF(int *id)
+OutputWarningF(int *id)
 {
-	::OutputLastWarning(*id);
+	::OutputWarning(*id);
 }
 
 void
@@ -363,13 +363,13 @@ DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
 {
 	return UnLoadDatabaseF(id);
 }
-DLL_EXPORT void __stdcall OUTPUTLASTERROR(int *id)
+DLL_EXPORT void __stdcall OUTPUTERROR(int *id)
 {
-	OutputLastErrorF(id);
+	OutputErrorF(id);
 }
-DLL_EXPORT void __stdcall OUTPUTLASTWARNING(int *id)
+DLL_EXPORT void __stdcall OUTPUTWARNING(int *id)
 {
-	OutputLastWarningF(id);
+	OutputWarningF(id);
 }
 DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
 {
diff --git a/fwrap.h b/fwrap.h
index 65f6875d..18caaeaa 100644
--- a/fwrap.h
+++ b/fwrap.h
@@ -34,8 +34,8 @@
 #define GetWarningLineF               FC_FUNC (getwarninglinef,               GETWARNINGLINEF)
 #define GetComponentCountF            FC_FUNC (getcomponentcountf,            GETCOMPONENTCOUNTF)
 #define GetComponentF                 FC_FUNC (getcomponentf,                 GETCOMPONENTF)
-#define OutputLastErrorF              FC_FUNC (outputlasterrorf,              OUTPUTLASTERRORF)
-#define OutputLastWarningF            FC_FUNC (outputlastwarningf,            OUTPUTLASTWARNINGF)
+#define OutputErrorF                  FC_FUNC (outputerrorf,                  OUTPUTERRORF)
+#define OutputWarningF                FC_FUNC (outputwarningf,                OUTPUTWARNINGF)
 #define OutputLinesF                  FC_FUNC (outputlinesf,                  OUTPUTLINESF)
 #endif /* FC_FUNC */
 
@@ -95,9 +95,9 @@ extern "C" {
 
   void GetComponentF(int *id, int* n, char* line, unsigned int line_length);
 
-  void OutputLastErrorF(int *id);
+  void OutputErrorF(int *id);
 
-  void OutputLastWarningF(int *id);
+  void OutputWarningF(int *id);
 
   void OutputLinesF(int *id);
 
diff --git a/fwrap2.cpp b/fwrap2.cpp
index 6b3aedde..3c93c98e 100644
--- a/fwrap2.cpp
+++ b/fwrap2.cpp
@@ -30,13 +30,13 @@ DLL_EXPORT int UNLOADDATABASE(int *id)
 {
 	return UnLoadDatabaseF(id);
 }
-DLL_EXPORT void OUTPUTLASTERROR(int *id)
+DLL_EXPORT void OUTPUTERROR(int *id)
 {
-	OutputLastErrorF(id);
+	OutputErrorF(id);
 }
-DLL_EXPORT void OUTPUTLASTWARNING(int *id)
+DLL_EXPORT void OUTPUTWARNING(int *id)
 {
-	OutputLastWarningF(id);
+	OutputWarningF(id);
 }
 DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
 {
diff --git a/fwrap3.cpp b/fwrap3.cpp
index bf87476b..0409d8dd 100644
--- a/fwrap3.cpp
+++ b/fwrap3.cpp
@@ -30,13 +30,13 @@ DLL_EXPORT int unloaddatabase_(int *id)
 {
 	return UnLoadDatabaseF(id);
 }
-DLL_EXPORT void outputlasterror_(int *id)
+DLL_EXPORT void outputerror_(int *id)
 {
-	OutputLastErrorF(id);
+	OutputErrorF(id);
 }
-DLL_EXPORT void outputlastwarning_(int *id)
+DLL_EXPORT void outputwarning_(int *id)
 {
-	OutputLastWarningF(id);
+	OutputWarningF(id);
 }
 DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
 {