Fix some names and get font-awesome going.