Renamed exceptions

Change-Id: I65b31f1ff2cbf083bb5f6bef434f541750747136