Eherot/improve library naming readability