Update regex and class names in alignment command

@stulees @alex-deaconu Thx.