Bug 54: Class names were included unnecessarily when using static constants. Now removed