diff --git a/react/actions/channel.js b/react/actions/channel.js
index d8aa953d..a1e34e71 100644
--- a/react/actions/channel.js
+++ b/react/actions/channel.js
@@ -1,4 +1,4 @@
-import * as actions from 'constants/action_types';
+import * as actions from 'constants/channel_action_types';
 
 // export action creators
 
diff --git a/react/actions/publish.js b/react/actions/publish.js
index 40dad4ed..603aca4e 100644
--- a/react/actions/publish.js
+++ b/react/actions/publish.js
@@ -1,4 +1,4 @@
-import * as actions from 'constants/action_types';
+import * as actions from 'constants/publish_action_types';
 
 // export action creators
 export function selectFile (file) {
diff --git a/react/components/PublishStatus/index.jsx b/react/components/PublishStatus/index.jsx
index 92279b92..1ed8f8dc 100644
--- a/react/components/PublishStatus/index.jsx
+++ b/react/components/PublishStatus/index.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ProgressBar from 'components/ProgressBar';
-import * as publishStates from 'constants/publishing_states';
+import * as publishStates from 'constants/publish_claim_states';
 
 function PublishStatus ({ status, message }) {
   return (
diff --git a/react/constants/channel_action_types.js b/react/constants/channel_action_types.js
new file mode 100644
index 00000000..35f27b3c
--- /dev/null
+++ b/react/constants/channel_action_types.js
@@ -0,0 +1 @@
+export const CHANNEL_UPDATE = 'CHANNEL_UPDATE';
diff --git a/react/constants/action_types.js b/react/constants/publish_action_types.js
similarity index 84%
rename from react/constants/action_types.js
rename to react/constants/publish_action_types.js
index 55f872e5..229b570e 100644
--- a/react/constants/action_types.js
+++ b/react/constants/publish_action_types.js
@@ -1,7 +1,3 @@
-// channel actions
-export const CHANNEL_UPDATE = 'CHANNEL_UPDATE';
-
-// publish actions
 export const FILE_SELECTED = 'FILE_SELECTED';
 export const FILE_CLEAR = 'FILE_CLEAR';
 export const METADATA_UPDATE = 'METADATA_UPDATE';
diff --git a/react/constants/publishing_states.js b/react/constants/publish_claim_states.js
similarity index 100%
rename from react/constants/publishing_states.js
rename to react/constants/publish_claim_states.js
diff --git a/react/containers/PublishForm/view.jsx b/react/containers/PublishForm/view.jsx
index fee191ef..56bf769b 100644
--- a/react/containers/PublishForm/view.jsx
+++ b/react/containers/PublishForm/view.jsx
@@ -5,7 +5,7 @@ import PublishUrlInput from 'containers/PublishUrlInput';
 import PublishThumbnailInput from 'containers/PublishThumbnailInput';
 import PublishMetadataInputs from 'containers/PublishMetadataInputs';
 import ChannelSelect from 'containers/ChannelSelect';
-import * as publishStates from 'constants/publishing_states';
+import * as publishStates from 'constants/publish_claim_states';
 
 class PublishForm extends React.Component {
   constructor (props) {
diff --git a/react/reducers/channel.js b/react/reducers/channel.js
index 14de9264..fcf1f33c 100644
--- a/react/reducers/channel.js
+++ b/react/reducers/channel.js
@@ -1,4 +1,4 @@
-import * as actions from 'constants/action_types';
+import * as actions from 'constants/channel_action_types';
 
 const initialState = {
   loggedInChannel: {
diff --git a/react/reducers/publish.js b/react/reducers/publish.js
index dea786c9..69696751 100644
--- a/react/reducers/publish.js
+++ b/react/reducers/publish.js
@@ -1,9 +1,8 @@
-import * as actions from 'constants/action_types';
-import * as channelSelectStates from 'constants/channel_select_states';
+import * as actions from 'constants/publish_action_types';
 
 const initialState = {
   publishInChannel  : false,
-  selectedChannel   : channelSelectStates.LOGIN,
+  selectedChannel   : null,
   showMetadataInputs: false,
   status            : {
     status : null,