ANTARCTICLE-276 renamed classes, added comments