1. Fix static file serving error 2. Change naming