updated lib naming; cleanup