Support more flexible naming; minor fixes