fixed: polymorphic naming convention not fully respected along the way