#23 - Resolve issue identifying base name