changed border names to more semantic