diff --git a/src/jrd/extds/InternalDS.cpp b/src/jrd/extds/InternalDS.cpp
index 16776f0e48..f28d40df54 100644
--- a/src/jrd/extds/InternalDS.cpp
+++ b/src/jrd/extds/InternalDS.cpp
@@ -63,7 +63,7 @@ static RegisterInternalProvider reg;
 
 // InternalProvider
 
-void InternalProvider::jrdAttachmentEnd(thread_db* tdbb, Jrd::Attachment* att)
+void InternalProvider::jrdAttachmentEnd(thread_db* tdbb, Attachment* att)
 {
 	if (m_connections.getCount() == 0)
 		return;
@@ -119,7 +119,7 @@ void InternalConnection::attach(thread_db* tdbb, const Firebird::string& dbName,
 	Database* dbb = tdbb->getDatabase();
 	fb_assert(dbName.isEmpty() || dbName == dbb->dbb_database_name.c_str());
 
-	Jrd::Attachment* attachment = tdbb->getAttachment();
+	Attachment* attachment = tdbb->getAttachment();
 	if ((user.isEmpty() || user == attachment->att_user->usr_user_name) &&
 		pwd.isEmpty() &&
 		(role.isEmpty() || role == attachment->att_user->usr_sql_role_name))
@@ -162,7 +162,7 @@ void InternalConnection::doDetach(thread_db* tdbb)
 		ISC_STATUS_ARRAY status = {0};
 
 		{	// scope
-			Jrd::Attachment* att = m_attachment;
+			Attachment* att = m_attachment;
 			m_attachment = NULL;
 
 			EngineCallbackGuard guard(tdbb, *this);
@@ -248,7 +248,7 @@ void InternalTransaction::doStart(ISC_STATUS* status, thread_db* tdbb, ClumpletW
 	}
 	else
 	{
-		Jrd::Attachment* att = m_IntConnection.getJrdAtt();
+		Attachment* att = m_IntConnection.getJrdAtt();
 
 		EngineCallbackGuard guard(tdbb, *this);
 		jrd8_start_transaction(status, 0, &m_transaction, 1, &att,	//// FIXME: public_handle
@@ -329,7 +329,7 @@ void InternalStatement::doPrepare(thread_db* tdbb, const string& sql)
 	m_inBlr.clear();
 	m_outBlr.clear();
 
-	Jrd::Attachment* att = m_intConnection.getJrdAtt();
+	Attachment* att = m_intConnection.getJrdAtt();
 	jrd_tra* tran = getIntTransaction()->getJrdTran();
 
 	ISC_STATUS_ARRAY status = {0};
@@ -552,7 +552,7 @@ void InternalBlob::open(thread_db* tdbb, Transaction& tran, const dsc& desc, con
 	fb_assert(!m_blob);
 	fb_assert(sizeof(m_blob_id) == desc.dsc_length);
 
-	Jrd::Attachment* att = m_connection.getJrdAtt();
+	Attachment* att = m_connection.getJrdAtt();
 	jrd_tra* transaction = ((InternalTransaction&) tran).getJrdTran();
 	memcpy(&m_blob_id, desc.dsc_address, sizeof(m_blob_id));
 
@@ -577,7 +577,7 @@ void InternalBlob::create(thread_db* tdbb, Transaction& tran, dsc& desc, const U
 	fb_assert(!m_blob);
 	fb_assert(sizeof(m_blob_id) == desc.dsc_length);
 
-	Jrd::Attachment* att = m_connection.getJrdAtt();
+	Attachment* att = m_connection.getJrdAtt();
 	jrd_tra* transaction = ((InternalTransaction&) tran).getJrdTran();
 	m_blob_id.clear();