update with disciplines

Add disciplines and refactor cycle names