Improve handling of platform-specific paths
Tweak naming