diff --git a/blocks/antelope/substreams.yaml b/blocks/antelope/substreams.yaml
index 18f10ab..bf95009 100644
--- a/blocks/antelope/substreams.yaml
+++ b/blocks/antelope/substreams.yaml
@@ -26,4 +26,4 @@ modules:
       - source: sf.substreams.v1.Clock
       - source: sf.antelope.type.v1.Block
     output:
-      type: proto:antelope.Events
+      type: proto:pinax.antelope.v1.Events
diff --git a/blocks/beacon/substreams.yaml b/blocks/beacon/substreams.yaml
index 2798ae4..ca4456d 100644
--- a/blocks/beacon/substreams.yaml
+++ b/blocks/beacon/substreams.yaml
@@ -26,4 +26,4 @@ modules:
       - source: sf.substreams.v1.Clock
       - source: sf.beacon.type.v1.Block
     output:
-      type: proto:beacon.Events
+      type: proto:pinax.beacon.v1.Events
diff --git a/blocks/bitcoin/substreams.yaml b/blocks/bitcoin/substreams.yaml
index 2fd1de8..1e239a5 100644
--- a/blocks/bitcoin/substreams.yaml
+++ b/blocks/bitcoin/substreams.yaml
@@ -25,4 +25,4 @@ modules:
       - source: sf.substreams.v1.Clock
       - source: sf.bitcoin.type.v1.Block
     output:
-      type: proto:pinax.bitcoin.Events
+      type: proto:pinax.bitcoin.v1.Events
diff --git a/blocks/cosmos/substreams.yaml b/blocks/cosmos/substreams.yaml
index c9674e8..eb65c79 100644
--- a/blocks/cosmos/substreams.yaml
+++ b/blocks/cosmos/substreams.yaml
@@ -25,4 +25,4 @@ modules:
       - source: sf.substreams.v1.Clock
       - source: sf.cosmos.type.v2.Block
     output:
-      type: proto:pinax.cosmos.Events
+      type: proto:pinax.cosmos.v1.Events
diff --git a/blocks/evm/substreams.yaml b/blocks/evm/substreams.yaml
index 4dde592..e9e54eb 100644
--- a/blocks/evm/substreams.yaml
+++ b/blocks/evm/substreams.yaml
@@ -27,4 +27,4 @@ modules:
       - source: sf.substreams.v1.Clock
       - source: sf.ethereum.type.v2.Block
     output:
-      type: proto:evm.Events
\ No newline at end of file
+      type: proto:pinax.evm.v1.Events
\ No newline at end of file
diff --git a/blocks/solana/substreams.yaml b/blocks/solana/substreams.yaml
index aa6baed..77f4439 100644
--- a/blocks/solana/substreams.yaml
+++ b/blocks/solana/substreams.yaml
@@ -1,7 +1,7 @@
 specVersion: v0.1.0
 package:
   name: raw_blocks_solana
-  version: v0.1.0
+  version: v1.0.0
   image: logo.png
   url: https://github.com/pinax-network/substreams-raw-blocks
 
@@ -23,24 +23,17 @@ protobuf:
     - google
 
 modules:
-  # - name: blocks_without_votes_all
-  #   kind: map
-  #   inputs:
-  #     - source: sf.solana.type.v1.Block
-  #   output:
-  #     type: proto:sf.solana.type.v1.Block
-
   - name: map_events
     kind: map
     inputs:
       - source: sf.substreams.v1.Clock
       - map: common:blocks_without_votes
     output:
-      type: proto:solana.Events
+      type: proto:pinax.solana.v1.Events
   - name: map_events_with_votes
     kind: map
     inputs:
       - source: sf.substreams.v1.Clock
       - source: sf.solana.type.v1.Block
     output:
-      type: proto:solana.Events
+      type: proto:pinax.solana.v1.Events
diff --git a/blocks/starknet/substreams.yaml b/blocks/starknet/substreams.yaml
index 258b10f..6367088 100644
--- a/blocks/starknet/substreams.yaml
+++ b/blocks/starknet/substreams.yaml
@@ -28,4 +28,4 @@ modules:
       - source: sf.substreams.v1.Clock
       - source: sf.starknet.type.v1.Block
     output:
-      type: proto:pinax.starknet.Events
+      type: proto:pinax.starknet.v1.Events