Fix some namimg issues and dependencies