Fixes in imports & class names