Re-enabled support for "/" in names...