Changed naming convention for libraries