Refactor names to underscore; add basic assets