diff --git a/specs/validator/0_beacon-chain-validator.md b/specs/validator/0_beacon-chain-validator.md
index 1a244f263..cacfebe7d 100644
--- a/specs/validator/0_beacon-chain-validator.md
+++ b/specs/validator/0_beacon-chain-validator.md
@@ -43,7 +43,7 @@ __NOTICE__: This document is a work-in-progress for researchers and implementers
                 - [Epoch boundary root](#epoch-boundary-root)
                 - [Shard block root](#shard-block-root)
                 - [Latest crosslink root](#latest-crosslink-root)
-                - [Justified slot](#justified-slot)
+                - [Justified epoch](#justified-epoch)
                 - [Justified block root](#justified-block-root)
             - [Construct attestation](#construct-attestation)
                 - [Data](#data)
@@ -251,7 +251,7 @@ Set `attestation_data.slot = slot` where `slot` is the current slot of which the
 
 ##### Shard
 
-Set `attestation_data.shard = shard` where `shard` is the shard associated with the validator's committee defined by `get_shard_committees_at_slot`.
+Set `attestation_data.shard = shard` where `shard` is the shard associated with the validator's committee defined by `get_crosslink_committees_at_slot`.
 
 ##### Beacon block root
 
@@ -273,15 +273,15 @@ _Note:_ This is a stub for phase 0.
 
 Set `attestation_data.latest_crosslink_root = state.latest_crosslinks[shard].shard_block_root` where `state` is the beacon state at `head` and `shard` is the validator's assigned shard.
 
-##### Justified slot
+##### Justified epoch
 
-Set `attestation_data.justified_slot = state.justified_slot` where `state` is the beacon state at `head`.
+Set `attestation_data.justified_epoch = state.justified_epoch` where `state` is the beacon state at `head`.
 
 ##### Justified block root
 
-Set `attestation_data.justified_block_root = hash_tree_root(justified_block)` where `justified_block` is the block at `state.justified_slot` in the chain defined by `head`.
+Set `attestation_data.justified_block_root = hash_tree_root(justified_block)` where `justified_block` is the block at `state.justified_epoch` in the chain defined by `head`.
 
-_Note:_ This can be looked up in the state using `get_block_root(state, justified_slot)`.
+_Note:_ This can be looked up in the state using `get_block_root(state, justified_epoch)`.
 
 #### Construct attestation