Tried to fix a name clash but failed
Revert "Tried to fix a name clash but failed"

This reverts commit 912b2f919e8f7fdf2ee25235ba06e12e8d115668.
Fixed a name clash for constants
Changed skin thickness back to minimal