ANTARCTICLE-276 renamed classes