Fixed issue with poorly named internal module causing conflicts