AS7-5749 Reading added but not started deployment leads to exception

Also rename few classes to properly reflect their purpose.