diff --git a/libraries/db/include/graphene/db/object_database.hpp b/libraries/db/include/graphene/db/object_database.hpp
index 8e91dbf4..3a4315c1 100644
--- a/libraries/db/include/graphene/db/object_database.hpp
+++ b/libraries/db/include/graphene/db/object_database.hpp
@@ -122,13 +122,13 @@ namespace graphene { namespace db {
          }
 
          template<uint8_t SpaceID, uint8_t TypeID>
-         auto find( object_id<SpaceID,TypeID> id )const -> const typename object_downcast<decltype(id)>::type* {
-             return find<typename object_downcast<decltype(id)>::type>(id);
+         auto find( object_id<SpaceID,TypeID> id )const -> const object_downcast_t<decltype(id)>* {
+             return find<object_downcast_t<decltype(id)>>(id);
          }
 
          template<uint8_t SpaceID, uint8_t TypeID>
-         auto get( object_id<SpaceID,TypeID> id )const -> const typename object_downcast<decltype(id)>::type& {
-             return get<typename object_downcast<decltype(id)>::type>(id);
+         auto get( object_id<SpaceID,TypeID> id )const -> const object_downcast_t<decltype(id)>& {
+             return get<object_downcast_t<decltype(id)>>(id);
          }
 
          template<typename IndexType>
diff --git a/libraries/db/include/graphene/db/object_id.hpp b/libraries/db/include/graphene/db/object_id.hpp
index 2d351181..c44dcc17 100644
--- a/libraries/db/include/graphene/db/object_id.hpp
+++ b/libraries/db/include/graphene/db/object_id.hpp
@@ -102,6 +102,8 @@ namespace graphene { namespace db {
    template<> \
    struct object_downcast<graphene::db::object_id<OBJECT::space_id, OBJECT::type_id>> { using type = OBJECT; }; \
    } }
+   template<typename ObjectID>
+   using object_downcast_t = typename object_downcast<ObjectID>::type;
 
    template<uint8_t SpaceID, uint8_t TypeID>
    struct object_id
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
index 1b7a57b9..86db6176 100644
--- a/libraries/wallet/wallet.cpp
+++ b/libraries/wallet/wallet.cpp
@@ -659,10 +659,10 @@ public:
    }
 
    template<typename ID>
-   typename graphene::db::object_downcast<ID>::type get_object(ID id)const
+   typename graphene::db::object_downcast_t<ID>get_object(ID id)const
    {
       auto ob = _remote_db->get_objects({id}).front();
-      return ob.template as<typename graphene::db::object_downcast<ID>::type>( GRAPHENE_MAX_NESTED_OBJECTS );
+      return ob.template as<graphene::db::object_downcast_t<ID>>( GRAPHENE_MAX_NESTED_OBJECTS );
    }
 
    void set_operation_fees( signed_transaction& tx, const std::shared_ptr<fee_schedule> s  )
diff --git a/programs/js_operation_serializer/main.cpp b/programs/js_operation_serializer/main.cpp
index 9ce86cfa..63a6d604 100644
--- a/programs/js_operation_serializer/main.cpp
+++ b/programs/js_operation_serializer/main.cpp
@@ -138,7 +138,7 @@ template<> struct js_name< vote_id_type >      { static std::string name(){ retu
 template<> struct js_name< time_point_sec >    { static std::string name(){ return "time_point_sec"; } };
 
 template<uint8_t S, uint8_t T>
-struct js_name<graphene::db::object_id<S,T> >
+struct js_name<graphene::protocol::object_id<S,T> >
 {
    static std::string name(){
 <<<<<<< HEAD