Rename static final vars
Update thrown exceptions